***Will only be used for new versions of 2.0 and beyond***